From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 14 Aug 2011 05:11:36 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2142^2~59
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=191a1a11878302cc9276b1d89e3275d1469a1c63;p=emacs.git

Merge from trunk.
---

191a1a11878302cc9276b1d89e3275d1469a1c63